ostbuild: Use .lastfetch file per branch

This way we don't try to update gtk+ twice, once for gtk master and
once for gtk-2-22.

diff --git a/src/ostbuild/pyostbuild/vcs.py b/src/ostbuild/pyostbuild/vcs.py
index 43adbbddfdd47ea2ee4e85cc7eb014376d5f7b26..a6c11d828b32b265356429fd31dd47ecc7e4d9a4 100755 (executable)
--- a/src/ostbuild/pyostbuild/vcs.py
+++ b/src/ostbuild/pyostbuild/vcs.py
@@ -100,7 +100,8 @@ def ensure_vcs_mirror(mirrordir, keytype, uri, branch):
         os.rename(tmp_mirror, mirror)
     if branch is None:
         return mirror
-    last_fetch_path = mirror + '.lastfetch'
+    branch_safename = branch.replace('/','_').replace('.', '_')
+    last_fetch_path = mirror + '.lastfetch-%s' % (branch_safename, )
     if os.path.exists(last_fetch_path):
         f = open(last_fetch_path)
         last_fetch_contents = f.read()